Auto merge of #2400 - JIghtuse:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 24 Feb 2016 17:12:29 +0000 (17:12 +0000)
committerbors <bors@rust-lang.org>
Wed, 24 Feb 2016 17:12:29 +0000 (17:12 +0000)
commit35480d721f2676faef0f6be903f6597b27f57287
treed00c20bf3edeb0b6a584ad542c756948d781f556
parentc91bf6139d2a05245a5e06c3e11007a4257c6e48
parent00dd4b7674cdd2f5366122b2c5a2859cc34016fb
Auto merge of #2400 - JIghtuse:master, r=alexcrichton

Fixes #2378